bitkeeper revision 1.1159.178.3 (419cb8c1UgT4GEBjhcYkdZbYSHPLpw)
authorcl349@arcadians.cl.cam.ac.uk <cl349@arcadians.cl.cam.ac.uk>
Thu, 18 Nov 2004 14:59:13 +0000 (14:59 +0000)
committercl349@arcadians.cl.cam.ac.uk <cl349@arcadians.cl.cam.ac.uk>
Thu, 18 Nov 2004 14:59:13 +0000 (14:59 +0000)
Merge arcadians.cl.cam.ac.uk:/auto/groups/xeno/BK/xen-2.0-testing.bk
into arcadians.cl.cam.ac.uk:/auto/groups/xeno/BK/xen-unstable.bk


Trivial merge